From 0a533e262808c9d60be83483b77a09e6999ee5e3 Mon Sep 17 00:00:00 2001 From: Robert Lipe Date: Sun, 2 Dec 2018 22:49:33 -0600 Subject: [PATCH] Pick up a few old NULL->nullptr conversions that are stuck inside __APPLE that tsteven4 dodged around since he couldn't confirm. --- jeeps/gpslibusb.cc | 2 +- magproto.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jeeps/gpslibusb.cc b/jeeps/gpslibusb.cc index f0fa63bf5..f60f1d5f9 100644 --- a/jeeps/gpslibusb.cc +++ b/jeeps/gpslibusb.cc @@ -98,7 +98,7 @@ char** os_get_garmin_mountpoints() { char** dlist = (char**) xcalloc(2, sizeof *dlist); dlist[0] = xstrdup("/Volumes/GARMIN"); - dlist[1] = NULL; + dlist[1] = nullptr; return dlist; } #else diff --git a/magproto.cc b/magproto.cc index 1dbdbe0d3..e3e44173f 100644 --- a/magproto.cc +++ b/magproto.cc @@ -1569,7 +1569,7 @@ const char** os_get_magellan_mountpoints() #if __APPLE__ const char** dlist = (const char**) xcalloc(2, sizeof *dlist); dlist[0] = xstrdup("/Volumes/Magellan"); - dlist[1] = NULL; + dlist[1] = nullptr; return dlist; #else fatal("Not implemented"); -- 2.30.2